Fix a crash with combo boxes in RESIZE_IMMEDIATE containers. (#326806,

2006-01-14  Matthias Clasen  <mclasen@redhat.com>

	Fix a crash with combo boxes in RESIZE_IMMEDIATE
	containers.  (#326806, Sebastian Bacher)

	* gtk/gtkcombobox.c (gtk_combo_box_size_allocate)
	(gtk_combo_box_size_request): Don't call
	gtk_combo_box_check_appearance() from here, as that
	can lead to recursion.
	(gtk_combo_box_init): Instead, call it here.

diff --git a/ChangeLog b/ChangeLog
index 4e4977831ed029bab1635fe08b0e2328706b883e..4df4e94f4e206dd6468e1999fd2dec548f181790 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-01-14  Matthias Clasen  <mclasen@redhat.com>
+
+       Fix a crash with combo boxes in RESIZE_IMMEDIATE
+       containers.  (#326806, Sebastian Bacher)
+       
+       * gtk/gtkcombobox.c (gtk_combo_box_size_allocate) 
+       (gtk_combo_box_size_request): Don't call 
+       gtk_combo_box_check_appearance() from here, as that 
+       can lead to recursion. 
+       (gtk_combo_box_init): Instead, call it here.
+
 2006-01-14  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreemodelsort.c (gtk_tree_model_sort_iter_children): fix

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4e4977831ed029bab1635fe08b0e2328706b883e..4df4e94f4e206dd6468e1999fd2dec548f181790 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,14 @@
+2006-01-14  Matthias Clasen  <mclasen@redhat.com>
+
+       Fix a crash with combo boxes in RESIZE_IMMEDIATE
+       containers.  (#326806, Sebastian Bacher)
+       
+       * gtk/gtkcombobox.c (gtk_combo_box_size_allocate) 
+       (gtk_combo_box_size_request): Don't call 
+       gtk_combo_box_check_appearance() from here, as that 
+       can lead to recursion. 
+       (gtk_combo_box_init): Instead, call it here.
+
 2006-01-14  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreemodelsort.c (gtk_tree_model_sort_iter_children): fix

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 66fe8022fbc8b61172d1e3cdce16f3060caab14a..7a96131d72f6c86d2ba9fc1e4b12cd6743747e77 100644 (file)
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -781,6 +781,8 @@ gtk_combo_box_init (GtkComboBox *combo_box)
   combo_box->priv->editing_canceled = FALSE;
   combo_box->priv->auto_scroll = FALSE;
   combo_box->priv->focus_on_click = TRUE;
+
+  gtk_combo_box_check_appearance (combo_box);
 }
 
 static void
@@ -1841,9 +1843,7 @@ gtk_combo_box_size_request (GtkWidget      *widget,
   GtkRequisition bin_req;
 
   GtkComboBox *combo_box = GTK_COMBO_BOX (widget);
-
-  gtk_combo_box_check_appearance (combo_box);
-
+ 
   /* common */
   gtk_widget_size_request (GTK_BIN (widget)->child, &bin_req);
   gtk_combo_box_remeasure (combo_box);
@@ -1936,8 +1936,6 @@ gtk_combo_box_size_allocate (GtkWidget     *widget,
   GtkRequisition req;
   gboolean is_rtl = gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL;
 
-  gtk_combo_box_check_appearance (combo_box);
-
   widget->allocation = *allocation;
 
   gtk_widget_style_get (GTK_WIDGET (widget),